From: nana-4 <hnmaigo@gmail.com>
Date: Sun, 19 Jan 2020 15:25:51 +0000 (+0900)
Subject: theme: Import widget stylesheets in a reasonable order
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~777^2^2~49
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=ebaf969a0521cd8ef6465dd704db6a01cdf45203;p=gnome-shell.git

theme: Import widget stylesheets in a reasonable order

Instead of alphabetical ordering, sort the widget stylesheets
from more global to more local while grouping related things.

This helps reduce unintended behaviors and ugly overrides and
make styling and debugging easier.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/938
---

diff --git a/data/theme/gnome-shell-sass/_widgets.scss b/data/theme/gnome-shell-sass/_widgets.scss
index 997fb8069..4ff6a122c 100644
--- a/data/theme/gnome-shell-sass/_widgets.scss
+++ b/data/theme/gnome-shell-sass/_widgets.scss
@@ -5,34 +5,44 @@
 //
 
 /* WIDGETS */
-@import 'widgets/app-grid';
-@import 'widgets/app-switcher';
+
+// Primary widgets
+@import 'widgets/entries';
 @import 'widgets/buttons';
-@import 'widgets/calendar';
 @import 'widgets/check-box';
-@import 'widgets/corner-ripple';
-@import 'widgets/dash';
-@import 'widgets/dialogs';
-@import 'widgets/entries';
-@import 'widgets/hotplug';
-@import 'widgets/ibus-popup';
-@import 'widgets/keyboard';
-@import 'widgets/login-dialog';
-@import 'widgets/looking-glass';
+@import 'widgets/switches';
+@import 'widgets/slider';
+@import 'widgets/scrollbars';
+// Popovers
+@import 'widgets/popovers';
+@import 'widgets/calendar';
 @import 'widgets/message-list';
+@import 'widgets/ibus-popup';
+// Notifications
 @import 'widgets/notifications';
-@import 'widgets/misc';
+@import 'widgets/hotplug';
+// Dialogs
+@import 'widgets/dialogs';
 @import 'widgets/network-dialog';
+// OSDs
 @import 'widgets/osd';
-@import 'widgets/overview';
+@import 'widgets/app-switcher';
+@import 'widgets/workspace-switcher';
+// Panel
 @import 'widgets/panel';
-@import 'widgets/popovers';
-@import 'widgets/screen-shield';
-@import 'widgets/scrollbars';
+@import 'widgets/corner-ripple';
+// Overview
+@import 'widgets/overview';
+@import 'widgets/window-picker';
 @import 'widgets/search-entry';
 @import 'widgets/search-results';
-@import 'widgets/slider';
-@import 'widgets/switches';
+@import 'widgets/app-grid';
+@import 'widgets/dash';
+// A11y / misc
+@import 'widgets/misc';
 @import 'widgets/tiled-previews';
-@import 'widgets/window-picker';
-@import 'widgets/workspace-switcher';
+@import 'widgets/keyboard';
+@import 'widgets/looking-glass';
+// Lock / login screens
+@import 'widgets/login-dialog';
+@import 'widgets/screen-shield';